auto merge of #696 : bkoropoff/cargo/build-break, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 13 Oct 2014 22:15:02 +0000 (22:15 +0000)
committerbors <bors@rust-lang.org>
Mon, 13 Oct 2014 22:15:02 +0000 (22:15 +0000)

Trivial merge